Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 23 Jul 2010 11:48:17 +0000 (11:48 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 23 Jul 2010 11:48:17 +0000 (11:48 +0000)
commit2f39e74368a2137db8cd484d24543f1f9eeb8719
tree26cabbfd6d72439897b9c2b08b4a2031b190c243
parent4073c8f68ab18bb7a4a664afcf2c61ec49623cab
parent84c38b6d2c414173ae9760909a05ff96698ebe03
Merge from mainline.